removed old files and changes folder structure