removed extraneous
fixed file structure