Changed Configuration to have 2 files to avoid clutter.