Moved files, refactored imports for examples