Updating layout and includes to use relative path