add entities module

See #8.
use entities everywhere
clear entities on initialization
Merge branch 'master' into entities

* master:
  States fix
Merge branch 'entities'

Close #8.

* entities:
  clear entities on initialization
  use entities everywhere
  add entities module