Merged skills.java into skill.java