Separate states to namespace