Reorganized angular directives, updated treemap api, and some server patches