Reorganize things in VS