Unit folders cleaned up

Unit folders cleaned up