change namespace and directory structure
change directory structure for Tests