with restructured files