subdirectory homepage not found after doing a preexisting subdirectory switch

Hey! So I made our site in a subdirectory of our website. I did the whole thing where I switch the site address and the wordpress address stays the same. Site shows up fine when you type in the main address.
Unfortunately, when you type in the subdirectory address, http://www.spray-on.com/mag, i get 404. Okay well, I fixed that part, it redirects to the main page instead http://www.spray-on.com.
Well, now when you google some of our key search terms, google has it to where the subdirectory shows up http://www.spray-on.com/mag instead of our main address, and the little thing says page not found. If you click on it, it’s cool, it takes you where you need to go but if you don’t click it, it looks dead.
Did i take something out i shouldn’t have?