added some folder hierarchy