Stratobird Reorg

Stratobird Reorg

nubtown rework (for cshellen)

nubtown rework (for cshellen)