New tsts system, project refactoring