Re re designed cp1 back area

Also removed large container at the connecting building from cp1 to 2.
These changes should make cp1 more accesable and simplify the layout.