Refactoring into correct package structure