TOOLS(structur): improve build structur
Merge branch 'master' of github.com:Gisto/Gisto