Updated version
Updated to naming convention
Extracted BaseArtifact from FileArtifact