Merged mechanics with engine; necessary reorganization followed