Numerous improvements
Rename to Engine, prepare for Gemification