MAINT: Move ordination files to the right place, and remove duplicate files.
MAINT: Fix imports in tests
MAINT: change import paths