Consistent naming + new dir layout (part 2).