Mega cleanup/reorganize directives/modules/services