Reordered blocks and items init
Tidied up the research storage item abstract