Removed duplicate classes to promote code reuse
Repackaged storage block
Merge branch 'feature/Refactor_blocks' into develop

Closes #10