More logical directory naming.