new core files and moved modules