move files and add tests