moving to new, more sensible structure