Revert "header folder"

This reverts commit bce2761deb599c1a28d02a08d08002a73cc8d036.