Big reorganization due to issues with Pythons relative imports