Fixed some routing issues, and folder errors.