Moved files around so the make more sense.
Delete empty group