test files organisation changes