refactored the directory structure.  Updated README.