Renaming and removing jsystem infra