changed structure to make packages more as expected by users