Partial refatoring and reorganization of code
Updated to the refactored names
Final renaming/refactor of codebase
Merge with master branch