Move state relatived stuff together