Updated files to new class organization