Restructure complete for segregated unit tests and Mavericks apache configs.