Moving files specific to the HAADF into their own directory and renaming the classes to match