Moved functions into arrangement namescape