improved folder hierarchy