Fixing some mess with structuring files