Modified directory structure to reflect groups, per the style guide