Redo file structure for gradle