Moved, deleted, updated some files