Refactoring and re-organizing project file hierarchy; using more consistent names.