Move to propper package (reverted from commit 9a95a192b9385642f0738f8fe267e4f4ca05b483)