big-time refactoring w/ subdirs.
Merge pull request #1 from marklar/directories

big-time refactoring w/ subdirs.