Updated layout. Added check for relocated artifacts.