Beginning Modpack class restructure