Moved classes
Merge origin/master