missing files

added missing files and reorganized filesinY