New Folder Structure, allowing sorbet-standalone shipping