Refactored structure, working on Bill Review.