Updated architechture, have analysed with HUSSACT, generator > domain is still pretty coupled though.. :P