I have switched to a clearer naming convention for my systems. This commit moves the directory and file locations to reflect that change.
