rearranged files and added groupinator