Merge branch 'issue-14-refactor-move-internals' into 'master'

Address #14: More refactoring

See merge request !17
1 job for master in 2 minutes and 17 seconds (queued for 3 seconds)
Status Name Job ID Coverage
  Test
passed test #7418

00:02:17