updated folder structure, added reset