Reorg

Organized code in proper way and addition of logger framework