some work on folder support
finalized folder design