refactoring & board dependencies