Cleaned up org and space configuration.