Architecture cleaning (9/48)

Architecture cleaning