Brandon: Restructuring in preparation for alpha testing.