major rework on units directory structure.