Move engine classes to engine folder
Update Makefile