restructured files separate directories