Move classes into src/main/java