Cleaned up the directory structure