Renamed main package folder. Restyled code.