adjust file structure & merge from tc, cf