Some refactoring + Router
Creation of TODO.md