Scaffold Codes, More packages refactorings