big-time refactoring w/ subdirs.