Moved files to better support cargo conventions