What is the process by which molecules move from lower to higher concentration?

I am confused about the difference between osmosis and diffusion regarding: Osmosis is water moving from lower to higher concentration, correct? How do solutes figure in Osmosis?