moving things around to get ready for python server stuff