better folder hierarchy