Organise files better; clean up after ourselves