Moved test data into folders to clean up root directory, tweaked a lot of stuff