reorder imports
Merge remote-tracking branch 'kali/feature/reorder_scrypt_import' into develop