Moved Warehaus specific stuff out to the approptiate project