Started to refactor code for more natural flow data and a semantic flow.