Fix independant folders