refactoring: pictore is a class now