Updated directory structure. The updated the README to reflect these changes.