minor fixes to project structure
more insignificant cleanup
for tag key use standard SetTagKeyMixin