Reorganized the directory tree to make more sense.
Updated the README to reflect changes to directory tree.