Changed class names and temporarely use lazybuilding branches
Merged branch lazybuilding and modified composer.json