Re-organize to reflect website layout correctly.