Rename files, add test folder