Cleaned up directory, reducing number of directories!