Organize pages so that it can be reuse to the trial page

Reviewer: dan v

Issue: re organize pages