Folder Structure

I've changed the folder structure as discussed.