Updated packages names, indentation style and some other small fixes