Refactored project structure
Removed unnecessary test imports
Merged packageRefactoring to DEV