Move class to more appropriate place