LQ : Bug fixing.  Source folder changes.