add folder framework and small fix.