fix placement of various files