Fix cases where app is in a folder with its name