Code refactor
Code reorg
solution changes