Moved engine classes into a different package