Changed data subdirectory structure

It seems that Githubdoes not like nested directories. I am flattening
the structure, moving all data directories in the main.