Group tasks

added some files and changed locations of the files