Tidied up router directory structure
Tidied up security and general directory structure