Move some subrutins to engine
Some changes in Makefile
Merge pull request #1 from niimailtah/dev

Dev