Moved classes to right packages
Merge remote-tracking branch 'origin/HEAD'