fix spaces and add empty directories