Remove package statements, add our names