added many changes to the server app folder