Server - moved to MVC model and code arrangements