changed some folder names, adjusted the UI