Keep directory structure
Release 2.5