Changed Configuration to have 2 files to avoid clutter.

Don't commit this yet. I need to push the rest in a moment.