Cleaned directory structure up