rename includes files and move config builder sections