update to maintain folder and library structure