code changes to support move from lib to root