reorganisation for packaging as module