Upgraded project structure

Project structure now compatible with AndroidStudio 0.2.x and gradle 0.5.+