Refactored packages
Additionally refactored packages. Resolved few puzzles