File orginization

Moving and renaming files for accuracy.