Moved package
Makefile improvements
Cleanup