Moved some files now that things look to be working.