- Setup new structure
- fixing some test cases
- cleaning up pom.xml