restructured app folder