Better packaging convention, moved source files to src/main/java/