architecture changes in progress

minor