Made changes as indicated by previous PR. Also, made some file renaming for clarification.