diff --git a/android/CHANGELOG.md b/CHANGELOG.md
similarity index 100%
rename from android/CHANGELOG.md
rename to CHANGELOG.md
diff --git a/android/LICENSE.txt b/LICENSE.txt
similarity index 100%
rename from android/LICENSE.txt
rename to LICENSE.txt
diff --git a/android/NOTICE.md b/NOTICE.md
similarity index 100%
rename from android/NOTICE.md
rename to NOTICE.md
diff --git a/README.md b/README.md
index c647601b3..175f0fdfe 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,121 @@
# Loop Habit Tracker
-Loop is a mobile app that helps you create and maintain good habits. While the original app was developed exclusively for Android, this branch contains a work-in-progress proof-of-concept multi-platform version of the app, which targets Android and iOS. **The software in this branch is still in pre-alpha stage. Expect bugs, incomplete features and poor performance.** Suggestions and pull requests are very welcome.
+Loop is a mobile app that helps you create and maintain good habits,
+allowing you to achieve your long-term goals. Detailed graphs and statistics
+show you how your habits improved over time. It is completely ad-free and open
+source.
-
- 
-
+
+ 
+ 
+
+## Screenshots
+
+[![Main screen][screen1th]][screen1]
+[![Edit habit][screen2th]][screen2]
+[![Habit strength][screen3th]][screen3]
+[![Habit history and streaks][screen4th]][screen4]
+[![Widgets][screen5th]][screen5]
+[![Night mode][screen6th]][screen6]
+
+## Features
+
+* **Simple, beautiful and modern interface.** Loop has a minimalistic interface
+ that is easy to use and follows the material design guidelines.
+
+* **Habit score.** In addition to showing your current streak, Loop has an
+ advanced algorithm for calculating the strength of your habits. Every
+ repetition makes your habit stronger, and every missed day makes it weaker. A
+ few missed days after a long streak, however, will not completely destroy
+ your entire progress.
+
+* **Detailed graphs and statistics.** Clearly see how your habits improved over
+ time with beautiful and detailed graphs. Scroll back to see the complete
+ history of your habits.
+
+* **Flexible schedules.** Supports both daily habits and habits with more
+ complex schedules, such as 3 times every week; one time every other week; or
+ every other day.
+
+* **Reminders.** Create an individual reminder for each habit, at a chosen hour
+ of the day. Easily check, dismiss or snooze your habit directly from the
+ notification, without opening the app.
+
+* **Optimized for smartwatches.** Reminders can be checked, snoozed or
+ dismissed directly from your Android Wear watch.
+
+* **Completely ad-free and open source.** There are absolutely no
+ advertisements, annoying notifications or intrusive permissions in this app,
+ and there will never be. The complete source code is available under the
+ GPLv3.
+
+## Installing
+
+The easiest way to install Loop is through the [Google Play Store][playstore] or [F-Droid][fdroid].
+You may also download and install the APK from the [releases page][releases];
+note, however, that the app will not be updated automatically. To build this
+app from the source code, see [build instructions][build].
+
+## Contributing
+
+Loop is an open source project developed entirely by volunteers. If you would
+like to contribute to the project, you are very welcome. There are many ways to
+contribute, even if you are not a software developer.
+
+* **Report bugs, suggest features.** The easiest way to contribute is to simply
+ use the app and let us know if you find any problems or have any suggestions
+ to improve it. You can either use the link inside the app, or open an issue
+ at GitHub. If you would like to receive the newest versions of the app
+ earlier than everyone else, [join our open beta on Google Play][beta].
+
+* **Spread the word.** If you like the app, share it with your family, friends
+ and colleagues. You can also rate and review the app on Google Play Store, to help
+ other users find it more easily.
+
+* **Translate the app into your own language.** If you are not a native English
+ speaker, and would like to see the app translated into your own language,
+ please join our [open translation project][poedit]. If the translation
+ is already completed, you are also very welcome to join and proofread it.
+
+* **Write some code.** If you are an Android developer, you are very welcome to
+ contribute with code. Please, see the [developer guidelines][dev-guide] for more details.
+
+## License
+
+
+
+ Copyright (C) 2016 Álinson Santos Xavier
+
+ Loop Habit Tracker is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by the
+ Free Software Foundation, either version 3 of the License, or (at your
+ option) any later version.
+
+ Loop Habit Tracker is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see .
+
+[screen1]: screenshots/original/uhabits1.png
+[screen2]: screenshots/original/uhabits2.png
+[screen3]: screenshots/original/uhabits3.png
+[screen4]: screenshots/original/uhabits4.png
+[screen5]: screenshots/original/uhabits5.png
+[screen6]: screenshots/original/uhabits6.png
+[screen1th]: screenshots/thumbs/uhabits1.png
+[screen2th]: screenshots/thumbs/uhabits2.png
+[screen3th]: screenshots/thumbs/uhabits3.png
+[screen4th]: screenshots/thumbs/uhabits4.png
+[screen5th]: screenshots/thumbs/uhabits5.png
+[screen6th]: screenshots/thumbs/uhabits6.png
+[poedit]: http://translate.loophabits.org
+[playstore]: https://play.google.com/store/apps/details?id=org.isoron.uhabits
+[releases]: https://github.com/iSoron/uhabits/releases
+[fdroid]: http://f-droid.org/app/org.isoron.uhabits
+[dev-guide]: https://github.com/iSoron/uhabits/wiki/Developer-guidelines
+[build]: https://github.com/iSoron/uhabits/wiki/Developer-guidelines#building
+[beta]: https://play.google.com/apps/testing/org.isoron.uhabits
diff --git a/android/README.md b/android/README.md
deleted file mode 100644
index 6bf18e251..000000000
--- a/android/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-# Loop Habit Tracker
-
-
- 
-
-
- /artifacts/content/coverage-badge.svg?guest=1)
-
-
- 
-
-
-Loop is a simple Android app that helps you create and maintain good habits,
-allowing you to achieve your long-term goals. Detailed graphs and statistics
-show you how your habits improved over time. It is completely ad-free and open
-source.
-
-
-
-
-
-
-## Screenshots
-
-[![Main screen][screen1th]][screen1]
-[![Edit habit][screen2th]][screen2]
-[![Habit strength][screen3th]][screen3]
-[![Habit history and streaks][screen4th]][screen4]
-[![Widgets][screen5th]][screen5]
-[![Night mode][screen6th]][screen6]
-
-## Features
-
-* **Simple, beautiful and modern interface.** Loop has a minimalistic interface
- that is easy to use and follows the material design guidelines.
-
-* **Habit score.** In addition to showing your current streak, Loop has an
- advanced algorithm for calculating the strength of your habits. Every
- repetition makes your habit stronger, and every missed day makes it weaker. A
- few missed days after a long streak, however, will not completely destroy
- your entire progress.
-
-* **Detailed graphs and statistics.** Clearly see how your habits improved over
- time with beautiful and detailed graphs. Scroll back to see the complete
- history of your habits.
-
-* **Flexible schedules.** Supports both daily habits and habits with more
- complex schedules, such as 3 times every week; one time every other week; or
- every other day.
-
-* **Reminders.** Create an individual reminder for each habit, at a chosen hour
- of the day. Easily check, dismiss or snooze your habit directly from the
- notification, without opening the app.
-
-* **Optimized for smartwatches.** Reminders can be checked, snoozed or
- dismissed directly from your Android Wear watch.
-
-* **Completely ad-free and open source.** There are absolutely no
- advertisements, annoying notifications or intrusive permissions in this app,
- and there will never be. The complete source code is available under the
- GPLv3.
-
-## Installing
-
-The easiest way to install Loop is through the [Google Play Store][playstore] or [F-Droid][fdroid].
-You may also download and install the APK from the [releases page][releases];
-note, however, that the app will not be updated automatically. To build this
-app from the source code, see [build instructions][build].
-
-## Contributing
-
-Loop is an open source project developed entirely by volunteers. If you would
-like to contribute to the project, you are very welcome. There are many ways to
-contribute, even if you are not a software developer.
-
-* **Report bugs, suggest features.** The easiest way to contribute is to simply
- use the app and let us know if you find any problems or have any suggestions
- to improve it. You can either use the link inside the app, or open an issue
- at GitHub. If you would like to receive the newest versions of the app
- earlier than everyone else, [join our open beta on Google Play][beta].
-
-* **Spread the word.** If you like the app, share it with your family, friends
- and colleagues. You can also rate and review the app on Google Play Store, to help
- other users find it more easily.
-
-* **Translate the app into your own language.** If you are not a native English
- speaker, and would like to see the app translated into your own language,
- please join our [open translation project][poedit]. If the translation
- is already completed, you are also very welcome to join and proofread it.
-
-* **Write some code.** If you are an Android developer, you are very welcome to
- contribute with code. Please, see the [developer guidelines][dev-guide] for more details.
-
-## License
-
-
-
- Copyright (C) 2016 Álinson Santos Xavier
-
- Loop Habit Tracker is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by the
- Free Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- Loop Habit Tracker is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- more details.
-
- You should have received a copy of the GNU General Public License along
- with this program. If not, see .
-
-[screen1]: screenshots/original/uhabits1.png
-[screen2]: screenshots/original/uhabits2.png
-[screen3]: screenshots/original/uhabits3.png
-[screen4]: screenshots/original/uhabits4.png
-[screen5]: screenshots/original/uhabits5.png
-[screen6]: screenshots/original/uhabits6.png
-[screen1th]: screenshots/thumbs/uhabits1.png
-[screen2th]: screenshots/thumbs/uhabits2.png
-[screen3th]: screenshots/thumbs/uhabits3.png
-[screen4th]: screenshots/thumbs/uhabits4.png
-[screen5th]: screenshots/thumbs/uhabits5.png
-[screen6th]: screenshots/thumbs/uhabits6.png
-[poedit]: http://translate.loophabits.org
-[playstore]: https://play.google.com/store/apps/details?id=org.isoron.uhabits
-[releases]: https://github.com/iSoron/uhabits/releases
-[fdroid]: http://f-droid.org/app/org.isoron.uhabits
-[dev-guide]: https://github.com/iSoron/uhabits/wiki/Developer-guidelines
-[build]: https://github.com/iSoron/uhabits/wiki/Developer-guidelines#building
-[beta]: https://play.google.com/apps/testing/org.isoron.uhabits
diff --git a/android/screenshots/original/uhabits1.png b/screenshots/original/uhabits1.png
similarity index 100%
rename from android/screenshots/original/uhabits1.png
rename to screenshots/original/uhabits1.png
diff --git a/android/screenshots/original/uhabits2.png b/screenshots/original/uhabits2.png
similarity index 100%
rename from android/screenshots/original/uhabits2.png
rename to screenshots/original/uhabits2.png
diff --git a/android/screenshots/original/uhabits3.png b/screenshots/original/uhabits3.png
similarity index 100%
rename from android/screenshots/original/uhabits3.png
rename to screenshots/original/uhabits3.png
diff --git a/android/screenshots/original/uhabits4.png b/screenshots/original/uhabits4.png
similarity index 100%
rename from android/screenshots/original/uhabits4.png
rename to screenshots/original/uhabits4.png
diff --git a/android/screenshots/original/uhabits5.png b/screenshots/original/uhabits5.png
similarity index 100%
rename from android/screenshots/original/uhabits5.png
rename to screenshots/original/uhabits5.png
diff --git a/android/screenshots/original/uhabits6.png b/screenshots/original/uhabits6.png
similarity index 100%
rename from android/screenshots/original/uhabits6.png
rename to screenshots/original/uhabits6.png
diff --git a/android/screenshots/original/wear1.png b/screenshots/original/wear1.png
similarity index 100%
rename from android/screenshots/original/wear1.png
rename to screenshots/original/wear1.png
diff --git a/android/screenshots/tasker/tasker_01.png b/screenshots/tasker/tasker_01.png
similarity index 100%
rename from android/screenshots/tasker/tasker_01.png
rename to screenshots/tasker/tasker_01.png
diff --git a/android/screenshots/tasker/tasker_02.png b/screenshots/tasker/tasker_02.png
similarity index 100%
rename from android/screenshots/tasker/tasker_02.png
rename to screenshots/tasker/tasker_02.png
diff --git a/android/screenshots/tasker/tasker_03.png b/screenshots/tasker/tasker_03.png
similarity index 100%
rename from android/screenshots/tasker/tasker_03.png
rename to screenshots/tasker/tasker_03.png
diff --git a/android/screenshots/tasker/tasker_04.png b/screenshots/tasker/tasker_04.png
similarity index 100%
rename from android/screenshots/tasker/tasker_04.png
rename to screenshots/tasker/tasker_04.png
diff --git a/android/screenshots/tasker/tasker_05.png b/screenshots/tasker/tasker_05.png
similarity index 100%
rename from android/screenshots/tasker/tasker_05.png
rename to screenshots/tasker/tasker_05.png
diff --git a/android/screenshots/tasker/tasker_06.png b/screenshots/tasker/tasker_06.png
similarity index 100%
rename from android/screenshots/tasker/tasker_06.png
rename to screenshots/tasker/tasker_06.png
diff --git a/android/screenshots/tasker/tasker_07.png b/screenshots/tasker/tasker_07.png
similarity index 100%
rename from android/screenshots/tasker/tasker_07.png
rename to screenshots/tasker/tasker_07.png
diff --git a/android/screenshots/tasker/tasker_08.png b/screenshots/tasker/tasker_08.png
similarity index 100%
rename from android/screenshots/tasker/tasker_08.png
rename to screenshots/tasker/tasker_08.png
diff --git a/android/screenshots/tasker/tasker_09.png b/screenshots/tasker/tasker_09.png
similarity index 100%
rename from android/screenshots/tasker/tasker_09.png
rename to screenshots/tasker/tasker_09.png
diff --git a/android/screenshots/tasker/tasker_10.png b/screenshots/tasker/tasker_10.png
similarity index 100%
rename from android/screenshots/tasker/tasker_10.png
rename to screenshots/tasker/tasker_10.png
diff --git a/android/screenshots/tasker/tasker_11.png b/screenshots/tasker/tasker_11.png
similarity index 100%
rename from android/screenshots/tasker/tasker_11.png
rename to screenshots/tasker/tasker_11.png
diff --git a/android/screenshots/tasker/tasker_12.png b/screenshots/tasker/tasker_12.png
similarity index 100%
rename from android/screenshots/tasker/tasker_12.png
rename to screenshots/tasker/tasker_12.png
diff --git a/android/screenshots/tasker/tasker_13.png b/screenshots/tasker/tasker_13.png
similarity index 100%
rename from android/screenshots/tasker/tasker_13.png
rename to screenshots/tasker/tasker_13.png
diff --git a/android/screenshots/tasker/tasker_14.png b/screenshots/tasker/tasker_14.png
similarity index 100%
rename from android/screenshots/tasker/tasker_14.png
rename to screenshots/tasker/tasker_14.png
diff --git a/android/screenshots/tasker/thumbs/tasker_01.png b/screenshots/tasker/thumbs/tasker_01.png
similarity index 100%
rename from android/screenshots/tasker/thumbs/tasker_01.png
rename to screenshots/tasker/thumbs/tasker_01.png
diff --git a/android/screenshots/tasker/thumbs/tasker_02.png b/screenshots/tasker/thumbs/tasker_02.png
similarity index 100%
rename from android/screenshots/tasker/thumbs/tasker_02.png
rename to screenshots/tasker/thumbs/tasker_02.png
diff --git a/android/screenshots/tasker/thumbs/tasker_03.png b/screenshots/tasker/thumbs/tasker_03.png
similarity index 100%
rename from android/screenshots/tasker/thumbs/tasker_03.png
rename to screenshots/tasker/thumbs/tasker_03.png
diff --git a/android/screenshots/tasker/thumbs/tasker_04.png b/screenshots/tasker/thumbs/tasker_04.png
similarity index 100%
rename from android/screenshots/tasker/thumbs/tasker_04.png
rename to screenshots/tasker/thumbs/tasker_04.png
diff --git a/android/screenshots/tasker/thumbs/tasker_05.png b/screenshots/tasker/thumbs/tasker_05.png
similarity index 100%
rename from android/screenshots/tasker/thumbs/tasker_05.png
rename to screenshots/tasker/thumbs/tasker_05.png
diff --git a/android/screenshots/tasker/thumbs/tasker_06.png b/screenshots/tasker/thumbs/tasker_06.png
similarity index 100%
rename from android/screenshots/tasker/thumbs/tasker_06.png
rename to screenshots/tasker/thumbs/tasker_06.png
diff --git a/android/screenshots/tasker/thumbs/tasker_07.png b/screenshots/tasker/thumbs/tasker_07.png
similarity index 100%
rename from android/screenshots/tasker/thumbs/tasker_07.png
rename to screenshots/tasker/thumbs/tasker_07.png
diff --git a/android/screenshots/tasker/thumbs/tasker_08.png b/screenshots/tasker/thumbs/tasker_08.png
similarity index 100%
rename from android/screenshots/tasker/thumbs/tasker_08.png
rename to screenshots/tasker/thumbs/tasker_08.png
diff --git a/android/screenshots/tasker/thumbs/tasker_09.png b/screenshots/tasker/thumbs/tasker_09.png
similarity index 100%
rename from android/screenshots/tasker/thumbs/tasker_09.png
rename to screenshots/tasker/thumbs/tasker_09.png
diff --git a/android/screenshots/tasker/thumbs/tasker_10.png b/screenshots/tasker/thumbs/tasker_10.png
similarity index 100%
rename from android/screenshots/tasker/thumbs/tasker_10.png
rename to screenshots/tasker/thumbs/tasker_10.png
diff --git a/android/screenshots/tasker/thumbs/tasker_11.png b/screenshots/tasker/thumbs/tasker_11.png
similarity index 100%
rename from android/screenshots/tasker/thumbs/tasker_11.png
rename to screenshots/tasker/thumbs/tasker_11.png
diff --git a/android/screenshots/tasker/thumbs/tasker_12.png b/screenshots/tasker/thumbs/tasker_12.png
similarity index 100%
rename from android/screenshots/tasker/thumbs/tasker_12.png
rename to screenshots/tasker/thumbs/tasker_12.png
diff --git a/android/screenshots/tasker/thumbs/tasker_13.png b/screenshots/tasker/thumbs/tasker_13.png
similarity index 100%
rename from android/screenshots/tasker/thumbs/tasker_13.png
rename to screenshots/tasker/thumbs/tasker_13.png
diff --git a/android/screenshots/tasker/thumbs/tasker_14.png b/screenshots/tasker/thumbs/tasker_14.png
similarity index 100%
rename from android/screenshots/tasker/thumbs/tasker_14.png
rename to screenshots/tasker/thumbs/tasker_14.png
diff --git a/android/screenshots/thumbs/uhabits1.png b/screenshots/thumbs/uhabits1.png
similarity index 100%
rename from android/screenshots/thumbs/uhabits1.png
rename to screenshots/thumbs/uhabits1.png
diff --git a/android/screenshots/thumbs/uhabits2.png b/screenshots/thumbs/uhabits2.png
similarity index 100%
rename from android/screenshots/thumbs/uhabits2.png
rename to screenshots/thumbs/uhabits2.png
diff --git a/android/screenshots/thumbs/uhabits3.png b/screenshots/thumbs/uhabits3.png
similarity index 100%
rename from android/screenshots/thumbs/uhabits3.png
rename to screenshots/thumbs/uhabits3.png
diff --git a/android/screenshots/thumbs/uhabits4.png b/screenshots/thumbs/uhabits4.png
similarity index 100%
rename from android/screenshots/thumbs/uhabits4.png
rename to screenshots/thumbs/uhabits4.png
diff --git a/android/screenshots/thumbs/uhabits5.png b/screenshots/thumbs/uhabits5.png
similarity index 100%
rename from android/screenshots/thumbs/uhabits5.png
rename to screenshots/thumbs/uhabits5.png
diff --git a/android/screenshots/thumbs/uhabits6.png b/screenshots/thumbs/uhabits6.png
similarity index 100%
rename from android/screenshots/thumbs/uhabits6.png
rename to screenshots/thumbs/uhabits6.png
diff --git a/website/screenshots/macos1.png b/website/screenshots/macos1.png
deleted file mode 100644
index e27539d4d..000000000
Binary files a/website/screenshots/macos1.png and /dev/null differ