Refactored some things into core
Merged ModBlah files into HerbologicaStuff, following pattern of my other mods