change folder structure, add test template