Update roadmap
Refactor source code structure