Added some files to prepare for tests
Moved every file again...