Simplified the classes, updated the exemple page