Move some more functions into the jack_engine header and cpp files and update them with appropriate names and use engine references.