Renamed directory

Trying to cut down on dashes/underscores,
and trying to be more expressive