cleaning up package naming and dependencies
Initial commit