Renamed unit/functional folders