Move class to main package