Controllers refactoring
Classes refactor to use Class.create() method