fixed file structure
fixed directories