Remove Battle and Movement Models, Update Schema