Moving files
Adding tests