Refactor: migrated overlay plugin to classes
Refactor: migrated storage plugin to classes