Refactoring Packagestruktur