refact(*): further architectural improvements