structure change
quick and dirty + project structure change
multi groups done
v10 release