restructured code slightly

* removed unnecessary code from engine
* replaced window props w/ reference