RF: finished refactoring using build classes