Restructure folder tree
More restructure
Restructure part 3
fix wording