Updating image classes with match method
Moved source code to main directory
Updated python package import statements