restructure files and dirs