solved hw3 and fixed file structure