Moving stuff around, deleting extra file.