move main class
do the refactoring
moving data package
doing the refactoring