repair RandomUser
add a structured data for each floor

prepare future pull request
simplify naming