added 'server_' prefix to server code, and 'app_' prefix to app code