Oops, Fix naming and directory layout.