Refactoring towards building blocks from DDD, engine version up to 0.2
Engine version updated, refactoring