Fixed stuff to make everything work
- Moved dependencies to Gradle
- Cleaned up generation etc.
- Removed DI, it fails on Android