Export to Android Studio Project

- Refactor packages