Restructured the packages and built SkillCards

plus lots of other things