Fixed class in wrong place