Refactor computing skills, misc order and content