maj todo ==> status
+ refactoring file names