Big renaming, module positions
Merge branch 'angular' of github.com:unregistered/nrt-webui into angular