Refactor includeme's for neurotic consistency
Collapse annotation resource and model

Close #1041