refactor post Review 3, rename packages + little bugs corrections