Moved file and added abstract class