Move class outside