Moved files into appropriate folders