restructured files and dirs