Reorganized packages in the engine, updated references