files and dirs are much cleaner now