staged the second time
Revert "staged the second time and reverted"

This reverts commit 0ac24181433f9ac614a5c2895595d7ebb2798e0d.
Revert "Revert "staged the second time and reverted""

This reverts commit e795ea6ddae716a707818905b8e4c8c80f041839.
amended
build dir struct
moving
resolving conflict