changed structure for immibis-core