Moved files to separate dirs