moved some files; rf in layouts