Refactor diazotheme structure