Fix ordering of imports as per the project's conventions

Always order imports alphabetically