refactoring, clean warnings, modif architecture package util