Restructure directories

Switched to Gradle which uses a different directory structure from Ant