cleaned directory structure