Removed data directory.
Removed data/foo references in constructors. Added data/ back, because unit tests need it.