Move units to separate package