changed mass to an abstract class
removed moved files