Improved: Configuration files merged into one