Changed to a package to allow its use in other projects