re-organizing hw1-new