renamed `resources' to `infra'; additional refactoring & cleanups