Fixing dumb folder structure.