file structure changes; style fixes