Moved Schedule class into package