update gitignores and reorder imports