Refactor/separate data types from storage#22

martynpclark wants to merge 4 commits into

CH-Earth:developCH-Earth/fuse:developfrom

martynpclark:refactor/separate-data-types-from-storagemartynpclark/fuse:refactor/separate-data-types-from-storageCopy head branch name to clipboard