Restructure models. Add additional pages for other contents