Rearranging topics to fit into 3 classes

Signed-off-by: Zoe Rooney <zoe@zoerooney.com>