Controller rework

Controller now holds sub folders