What is the difference between a tissue and an organ?

The way that I know it is that cells make up tissue, tissue makes up organs, and organs make up organ systems.

These tissues make up organs (so for example the heart is made up of many tissues). These organs then work together forming organ systems (such as the digestive system, which is made from organs such as the stomach, intestines and rectum) to perform a particular function.