Combined the PSDs into 1

Cleaned up the folders a bit as well and removed any clutter for
developer efficiency