Revert "Revert "folder cleaned and integration with app""

This reverts commit fc487321ff0ab3415f6bfa6904133390aa28e06d.