Refactoring, adding templates and UI modules
Merge remote-tracking branch 'origin/development' into development