Combined PSDs into one for easier build

Folders marked with a "+" is to indicate a toggle of state.