Move class and fix namespace