restructured everything, uses ETK for build, more topic 5 & 6