Massive refactoring of specs and company.