Added extra modules. Setup indentation rules.