reorganizing files and more setup for testing