reorganize files; move into test folder.