minor cleanup to file structure