Added File structure, new gradle builder