issue #1 - add missing resources
issue #1 - packages / classes refactoring
issue #1 - packages / classes refactoring