Structure changed

Project structure changed according to gradle android plugin default
source set
2 helper classes