Change User/Theme Module structures