Minr Refactor on packages structure