Tidying up file structure