Move files
Add few tests