rename: core -> env
general cleanup