Moved test files to test directory
 Renaming