Correct Directory Structure

Previous directory structure was convoluted.