Moved Java classes to src/main/java