Tidied up contacts a bit
Moved more stuff into routing package