Improved directory structure, release 1.1