Just move everything to root package