small changes to dir names etc