Moved folders and files to the proper location