move core-demo.* to core/demo.*