Department and Shop refactoring