FIT-52: rename organisation fixes for imports #55

Closed pd-dudkiewicz closed 9 months ago