Separated engine objects.
setting up
Reflecting recent changes
Merge pull request #104 from Seneca-CDOT/organize

Organize