removed squid demo, simplified dir naming scheme