Beginning folder interrface revamp
More work on integrated folder interface