Refactor a little, delete old classes, name constants...