ReStructure & Test
Merge-Fail-Fix Conn.py