Refactored & Consolidated Config Files