Timothy1

Refactoring of Artist class + base of all the stuff in the nick2 branch.