Cleaned up a fer more Directories