Directory Changes

Updated variable locations to reflect reorganization.