add new col definition
remove the uesless first line
merge
remove old folder