inor : fixed activity, comment and remove folder entity