Add map name
Move functional tests in functional directory
Upgrade flow architecture