Restructured resource directory to fix build problems of other Android projects with dependencies on the Android library project
More restructuring to fix build problems of other Android projects with dependencies on the Android library project