Re-organization of code
increment toward functional demo.