Move pages into app
Avoid rerender for now until figured this out