changed library structure