Made component references more logical - very similar to eagle version