Changed folder and file names to work better in Android project