relayout directory structure to reflect go learnings