Re-configured file structure to put server in app/server