Moved configuration to seperate classes.
Refactored things to use other packages