irritating window locations after a closed clam
I use an AppleScript tied to a keyboard shortcut that runs as an Automator service.
Something like this:

tell application "System Events"
tell application process "iTunes" -- non running procs fail silently
    try
        set position of front window to {22, 26} -- or you can call windows by name
    end try
end tell
end tell


You'll need two scripts, one for each configuration. Obviously, you'll have to enter all your windows and Apps into the code, so this is only a worthwhile effort for the stuff you commonly use.