Move to relative paths and update to 2.1.3.GA