Cleaned up the directory tree