Started switching to gradle build script
Switched around packages