Folders are reorganized
Some interface improvements are made