Move package to own folder