rework file structure (see #1)