Reorganize engine module