Cleaned up Workspace Directory + New dir