Added base class and fixed license stuff again