Changed to class structure, improved face detection and eye detection algorithms