Clean Solution to make new Architecture