Big reorganisation, implement some basic routes