Pkg refactoring (for better clarity & standards)