Cleanup, and removed the sub-module.
#37