Rearranging files to match gradle's layout
Switching to gradle for building