Breaking core files out from demo files.