Code refactor (new packages)