Creating test option for make.
Moved data.h files into data directory.