Revert "moved A2, B1, H1, S1, G2, NOC-DC"

This reverts commit 50bab19ca9397498e50da129e7628eb0456fd2ec.