Organizing packages; Minor fixes;