Now root folder independant