How do you plan on putting the HDD in the optical bay? I bought cheap caddy from Amazon for $14. Technically, only replacing the HDD and RAM don't void the warranty. Therefore, moving it would void the warranty, as would removing the SuperDriver to make space. However, if you are careful, Apple might not notice/care if you replace the SuperDrive before taking it in for repairs.