rearrange folders, add w7d3