Changing code structure to namespace-packages