correct flow and layout
Remove extraneous directory
Merge
Merge