refactor: organising