changed the library structure