Core: Demo handler now has own file. Better abstraction