move classes around to be better organized in pacakges