Folder Restructure - 2
Onboard#2 + Home UX

Base Template also modified