reorganized to be used as a submodule
cleaning up a mess
renamespacing everything
renamespacing everything