prior to change
fixed library structure