small updates
Merge branch 'master' of stico_github:stico/code_repo
adjust dirs
small cleanup