Fixed the structure

missed a few levels of directories as described in the milestone2 writeup