Rename welcome views
Refactor Server model