starting engine overhaul: cleaned out header files and namespaces