#002

- Router class improvement
- Directories re-organization