Fixed support for installation in subdirectories