#1: refactor mojo hierarchy in anticipation of further features