WIP classification
optimize files and dirs