better organization of libraries