Organize imports in spec