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