move hw5 to the right package
go on implementing task 5