Refactoring documentation + update roadmap