Refactor module structure and cleaning up pom files