Added sorting to basic queries.
Tidied dependencies.
Fixed silly folder named joe.clarity
Fixed test and tidied files.