Initial engine commit + cleanup