Big overhaul of the structure of the library