Organize test etc files