Class Field refactored
Fix file ending