architecture changes

merged entities to board