add classes, refactor config