Config files moved and renamed to avoid clutter