Fixed up folder hierarchy