Directory Cleanup
Merged with master