changed directory structure to make it less cumbersome