B 52097 : refactored packages

refactored packages