more file reorganisation
tidy up
closes #201 - select values will be treated as numbers where appropriate