Refactoring

- new: resource classes