Step: refactor amount

Move amount methods to Money