Revert "folder cleaned and integration with app"

This reverts commit bfe08d12e539ba937dcf7f4dc8bca5ea009cbed4.
Revert "merge fixed"

This reverts commit 55606b6fcd06c4f7b3e50cb802b3df50931f7135.