tidying up directory structure