Further refactoring work on the HAADF branch to create data structures that match as best as possible the BrightField branch so these branches can come together.