tidy up directory structure