Fixed the folder hierarchy