Revise directry names

Changed directory names to be mroe descriptive.