Rename and move it

See #3 

<!---
@huboard:{"order":23.0}
-->