correct folder hierarchy