Updated directory structure to play nice with the packagist package.