Restructuring for lib
Restructuring
Continuing restructure
Finished restructure