changed navigation, code organization