Tidy and structure

Moved around some of the snap-sidebar stuff and generally maintained code organisation

Signed-off-by: Oliver Hunt <oliver@oliverhunt.net>