Moved files and removed old code