[pro] code organization and name conflicts