updated var names
removed libqparser.cpp and moved functions to core.cpp