Revert "made python server folder a module"

This reverts commit 569490164afef536d9f6ebf2fdcbe3a35e1479a2.
fixed branch craziness