Updated project structure to be compatible with Android projects