Tidy up of directory structure