Merge "BUG-99: cleanup packages"