Package name restructure and housekeeping