Refactor: gut angular fat and reorg dirtree