Move classes to engine package