Update major code organization from Pre-Alpha