refactor to follow namespace more directly to ease annotation autloading woes