Updated the file structure and added server files. Also fixes #31