Refactoring: Corrected package structure