Update directory structure
Fix uninstall function