Move java files from src to java