commit to align the codebase to maven directory structure.