Moved files to be under the war