Consolodated directories to get rid of unnecessary layers