More refactoring, made (some) progress to the Liber Scientiam (btw, the new name for the Encyclopedia)