Initial folder structure reset.
Did a blanket PEP8 cleanup.
merged Rob's rerooting branch back into trunk
dropped zencw2 by accident in the merge, replaced