Move some of the classes in their own php file for helpin auto-loading of classes.