refactor folder structure

refactor folder structure