fix controllers position
Merge branch 'master' of https://github.com/djodjoni/jjson
major refactoring