Updated routes, added organization templates and 404