changed package layout to something simplier