Little bit of file cleanup/organisation