Moving directory structure to the top for ease of use.
updates for moved test directory