Updated System to get rid of Storage base class

removed Window Storage and Shader Storage since they only held a single
value