Cleanup

-Removed and sorted usings
-Moved usings inside namespace