Define classes
Updated files