Fix imports, organize imports, fix warnings