Huge refactoring
Add Laurent to CREDITS :-)