Moved into own package, and set files to utf8