Restruct class
Merge branch 'hotfix/20140203'