Changing SkillOriginMap Calculators to instantiable classes that are contained within each skill
Deleting unneeded file