changed folder structure, wrote testing function