Removed unused file
Updated namespace
Finish recycing-fixes
Merge branch 'origin/master'