Separate Core and Engine related classes