massive refactor to demo server to make all things more clear and intuitive