Refactoring ats-lang.org