Moved parent class file out