move classes into proper package