Break out more things into class structure