Health works
some files refactoring