Start of Namespace Reorganization
- Moving to new namespace
- updating old code
- cleaning up/standizing code
- Finishing namespace reorganization
- Removing old System code
- Tested and working (More testing needed.)
Merge branch 'master' into ns-reorg

Conflicts:
	includes/configs/site.json