removed all static class singletons
shifted file related items to storage class