Improve folder hierarchy