refactored package structure to make Maven happy.