Created independent bucket index inside bucket persistence file. Allows for more refactoring of this file.
Refactoring budget bucket file format.  Conversion done, but more tests reqd, some CA's, and some tidy up.
All budget mappers now inheriting BasicMapper
Clean up CA warnings