cleaned up subdirectories + mkdir stuff