Group refactor

refactored that shiz

![harry](https://f.cloud.github.com/assets/4197603/1604004/d99f5ca6-53b4-11e3-95b5-2c1f4d090251.gif)