Merge "Organize file structure for tests"