Small fixes to accommodate the new folders structure.