[AAI-191 Amsterdam] Refactor import statements