Updated Base Mod Code to reflect structure of mod