Fixing bugs coming from folder restructure