Major refactor and rename new naming conventions
Merge branch 'development' into gh-pages