Added Gradle to project and moved some things as a result
Took out package