Move files into more sane locations

Remove an unused import

Update Readme