Changed name conventions
Implemented base Controller class
Implemented Entity mask system