correct folder stucture