really fix the file structure