Add config file and merge classes