refactoring project structure to support maven plugin