Splitting into several packages