refactor(structure): making two packages