Change modules design to be like onion architecture.