Enchanting rework for Enchanted Books and Enchanting Table

I suggest completely overhauling the enchanting system by changing how Enchanted Books and the Enchanting Table work. For the books instead of relying of villagers for books . They would all spawn in there respective structures or other method to obtain such as Villager trading. Example Aqua Affinity, Depth Strider, and Respiration Books would spawn in Ocean Monuments, Shipwrecks, and Ocean Ruins. Fishing enchantments would be found by fishing etcetera. Then after getting a book you can read it and it will now be permanently learned by your character . After learning a book you can go to an Enchanting Table and in the UI there will be all the books you have found so far. Now you can select any combination of enchants you want. Example you have found Sharpness and Unbreaking and want to put them on you Sword. So you get your Lapis and Sword then go to the Enchanting Table. Then you select Shapness and Unbreaking. Then the levels of the enchant then you see the cost of the enchantment and finally you hit confirm. Some other things For each level of the enchantment you could need to find a separate book. Example you would need 3 Unbreaking books to get Unbreaking 3. You could still have a random enchantment system. That just gives random enchantment since your character doesn't know what they are doing just fumbling around hoping things workout. You could have the new system and old system under options when making a new world And just have the anvil for repairing