Prepared for multi-version support
Support for 6.1.0 added
Directory layout refactoring