Moving more stuff beck

Conflicts:
	src/c++/engine/interface.cc
Minor fix