Moved files
Removed stale code