fix file structure
fix file names