extra changes regarding folders and some more modules