Refactoring of specs and skills started