apply namespace rearrangement
fix readme (+1 squashed commit)
Squashed commits:
[5d0e365] add readme