Refactoring work towards new structure