Added missing files and removed old 'Admission' class