moved main; renamed terminal package