add Superluminal, begin reorganizations