Add in more missing files from SVN and cleanup