Reorganize simpli views and state