Cleaned up the runtime hierarchy (parented objects to 'containers')