package resturcturing: following Go conventions