split to diff config, cleaned up lib and modif gen