refact continued : files update and additions