reorganization to aid in pydev
fixed every place that broke the build