Moved test files to directories