Cleanup and adding support for symlinks