Removing test files (reorganizing)