Some refactoring + base of a new business layer