moved test files to correspond to new directory structure
updated import statements
updated to reflect new directory structure