folder and file fixes