Changed into a package to allow for easier importing into other projects