Updating Library structure and modifying README