Fixing some directory/naming issues