Architecture cleaning (13/48)

Architecture cleaning