replaced shuttle and schedule classes correctly this time

also fixed packages