Move all the things (YES. Move them.)

Also, implemented some basic modlist logic, to be wired up.