removed old files
fixed structure