Restructured the library