Code formatting, package renaming