Fixed directory/naming bugs