restructured file tree