Revert "moving all to the parent dir"

This reverts commit c3b56c670cbbf0fab29231f8070ef483accc74f0.