Cleaner file structure

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