Switched back to Maven and upgraded to Java 8