Coalesced the different directories
Fixed color