Cleanup, and fix Maven dependencies and compile pathway