rearranging towards making osgi