Organize directories with less nesting.
Clean up gitignore.
Organize gradle build files.