Clean up gradle file
Move files to "proper" locations