When said courthouse shall be completed and ready for occupancy, the said county officers shall remove their offices and the records thereof to such offices or rooms in the new courthouse as may be designated for them respectively by the county commission, and the sheriff, upon completion of the jail, shall remove and keep therein any prisoners in his custody.