Moving app-state to a new file