rework framework and core files, adapt paths in core and modules