Reorganized to correct Maven project structure.