Fixing turned in shoulder

My shoulders are turned in probably because I'm the computer all the time, but I need to cange them back so they are align with my body. It is very difficult for me to do shoulder shrugs for my traps because my shoulders are turned in. I have been doing push ups to straighten out by shoulders, but nothing has happened. Also I sleep on my right shoulder most of the time and it is much more turned in than the left. Every morning I have to a large circle motion with my arms to crack my right shoulder in place. So how do I align my shoulders? Thanks in advance