Moved all files to the correct location