Adjusted file structure so we can run the server..