Rearranged directory & added VS solution & project