Finished organizing Hapis hierarchy. Various nesting performance optimziations. Bunch of general tidying.