Fixed project structure and prepped for uploading to maven central