Updated source files for use with the default package