Moved more files into place