Moved files for easy import into other projects