structure changes; new directories