Tidy up folder structure for tests
Add untracked files