Re-organize classes to be a bit more organized