move systems to their own dict in Enterprise