Correcting gradle project structure