Restoring packages from build. Doing small refactor