Restructure the library