Moved files to directories. Finished 35,36