[UPDATE] Reorganized the requires all over the classes.