Refactoring stuff (moving files)
-Edits on sequential
Merge branch 'grouping'