Cleanup + reorganization
Final pom changes for now