Corrected the directory structure for proper packaging naming.
Fixed the pathnames in the tests to go with newly corrected directory structure.