Restructuring project: remerging engine and engine-test