Architecture cleaning (8/48)

Architecture cleaning