Architecture improvements

+ RE-RE-renamed the classes. Musician is once again the main class, and
will be the one from now on!