Added configuration subsytem headers and source files
Fixed merge issue