Moving Handlers to a separate directory.
Added StorageService.