Refined code structure and put in fairly solid tech foundation