Remove files in wrong places and some test file