simplify structure again
further restructure to something actually achievable... steal how angular uses traceur, but balk at the way angular has this setup