Tidied up routes structure