Improve code structure
Merge branch 'master' of github.com:csyo/Groupack