Cleaned up some subdirectories.