Move some files around
Misc
Continue cleanup, engine code