Fix indentation and rename to lower case for packages