Changes to file structure and updates to B3