fixing typo and moving class