Fix paths to make everything generic