Revised packaging and object design pattern/ logic