Redefined class file structure.