Refactored to use MVC instead of WINK. Deleted value objects and moved them to specific modules
Added VO's to relevant modules.