Few new files & clean up