Moved  files to new naming structure for code reviews.