changed some files, moved some others