Move files with tests to reflect the code