Refactoring, mainly to namespace what should be so
Catchup
Cleanup
Cleanup