Cleaned up a few more Directories