Organize import...
Refactoring of CRS handling