First stage in rewriting Entity-System module
Removing useless inclusions
Fixed consts, references and variables