Updated to support coexisting with a static html site. clean dir names