Updated project to use Java 8
Renamed packages