move class to another package
fix separator in menu
Merge remote-tracking branch 'origin/master'