Regroup files.
Update.
Merge pull request #2 from Schlock/regroup_files

Regroup files