Moved withdrawal and annual fees to charges

Vishwas,

This pull request includes support for savings Activation time charges, and moved withdrawal and annual fees to charges.

Regards
Ashok