Fix package structure and typos in name