Move class to package