refactor app folder structure
refactor