updated library structure to follow current standards