bit of renaming plus Warehouse class