restructure app
refactor