REfactored skills into router