Moved files and worked on code