Switch to new gradle project structure