Moved files to proper folders